Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: fix deadlock in dml statement with cte when oom panic action was triggered (#49192) #49201

Merged
merged 2 commits into from
Dec 8, 2023
Merged

executor: fix deadlock in dml statement with cte when oom panic action was triggered (#49192) #49201

merged 2 commits into from
Dec 8, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #49192

What problem does this PR solve?

Issue Number: close #49096

Problem Summary:

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

 executor: fix deadlock in dml statement with cte when oom panic action was triggered

@AilinKid @ti-chi-bot
This is an automated cherry-pick of pingcap#49192
0aae707 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Dec 5, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 5, 2023
Merged
13 tasks
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 5, 2023
@ti-chi-bot ti-chi-bot closed this Dec 5, 2023
@AilinKid AilinKid reopened this Dec 6, 2023
@AilinKid
fix conflicts
b1099a9 
Signed-off-by: AilinKid <314806019@qq.com>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 6, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 6, 2023 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@8445821). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-6.5     #49201   +/-   ##
================================================
  Coverage               ?   73.6634%           
================================================
  Files                  ?       1087           
  Lines                  ?     349472           
  Branches               ?          0           
================================================
  Hits                   ?     257433           
  Misses                 ?      75534           
  Partials               ?      16505

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 6, 2023
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 6, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, guo-shaoge

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [AilinKid,guo-shaoge]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 6, 2023
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 6, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-06 06:45:13.820917613 +0000 UTC m=+1596342.486143806: ☑️ agreed by AilinKid.
  • 2023-12-06 07:01:09.940284761 +0000 UTC m=+1597298.605510955: ☑️ agreed by guo-shaoge.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 8, 2023
@ti-chi-bot ti-chi-bot bot merged commit bb5be54 into pingcap:release-6.5 Dec 8, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid approved these changes

@guo-shaoge guo-shaoge guo-shaoge approved these changes

Assignees

@AilinKid AilinKid

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @guo-shaoge @AilinKid